Auto merge of #2092 - gkoz:lock_line_endings, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 30 Oct 2015 19:39:46 +0000 (19:39 +0000)
committerbors <bors@rust-lang.org>
Fri, 30 Oct 2015 19:39:46 +0000 (19:39 +0000)
commit3367b9c52dc154f52058c878555163fb368cfb89
treee830a401bc2823b50a05273a2dbea7508bc0de4f
parent0590d3067e72318e438a82350d225528212cb79f
parentda4b8afba8afd888587d439c7f14ed06aa836d36
Auto merge of #2092 - gkoz:lock_line_endings, r=alexcrichton

Before writing the lockfile read the existing one and

 * detect the line endings style, fixes #2076, #1722;
 * compare the contents to avoid redundant overwriting.